extended CFLAGS so that config.h can be included.

2008-01-10  Sven Neumann  <sven@gimp.org>

	* extensions/Makefile.am: extended CFLAGS so that config.h can
be
	included.

	* extensions/*.c: fixed up includes.

	* extensions/gegl-fixups.c: use linear <-> gamma conversions
from
	base/util.c.

svn path=/trunk/; revision=272

diff --git a/ChangeLog b/ChangeLog
index 4011ae7551c0ee2a0c09ecb01772f8ac58cdc713..dd73549eadf946e8b73fc3c1c8dab2ee195425bd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-01-10  Sven Neumann  <sven@gimp.org>
+
+       * extensions/Makefile.am: extended CFLAGS so that config.h can be
+       included.
+
+       * extensions/*.c: fixed up includes.
+
+       * extensions/gegl-fixups.c: use linear <-> gamma conversions from
+       base/util.c.
+
 2008-01-07  Kevin Cozens  <kcozens@cvs.gnome.org>
 
        * babl/babl-extension.c (babl_extension_load_dir): Reverted previous

diff --git a/extensions/CIE-Lab.c b/extensions/CIE-Lab.c
index 6629ff7f83422ece453635d2076a3fa2060be806..7f5f59f5bf851eed6118190ff3274aa1e950ad3a 100644 (file)
--- a/extensions/CIE-Lab.c
+++ b/extensions/CIE-Lab.c
@@ -16,9 +16,13 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
+
+#include <math.h>
 #include <string.h>
+
 #include "babl.h"
-#include "util.h"
+
 
 int init (void);
 

diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index 34a9be95443f442a0572b8cc7b8acb2714802725..e546d7e42a1aded6cd8f1f100a14d46f19638e9b 100644 (file)
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -13,7 +13,11 @@ EXTRA_DIST      = $(wildcard *.[ch])
 
 all-local: $(SOBJS)
 
-CFLAGS  += -I $(top_srcdir)/babl -I $(top_srcdir)/extensions -fPIC
+CFLAGS += \
+       -I $(top_srcdir)                \
+       -I $(top_srcdir)/babl           \
+       -I $(top_srcdir)/extensions     \
+       -fPIC
 
 LDFLAGS += -shared
 

diff --git a/extensions/gegl-fixups.c b/extensions/gegl-fixups.c
index 35f0d1a8d9a6c1139eddad85422bacb1fedfe15f..65482bf48ac8c5ec3dfd439e18af838396b61e89 100644 (file)
--- a/extensions/gegl-fixups.c
+++ b/extensions/gegl-fixups.c
@@ -22,14 +22,6 @@
  *  Copyright 2003, 2004, 2005, 2007 Øyvind Kolås <pippin@gimp.org>
  */
 
-#include "babl.h"
-
-#define INLINE    inline
-
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
-
 /*
  * Implemented according to information read from:
  *
@@ -47,32 +39,14 @@
  * TODO: error diffusion,
  */
 
-#define BABL_USE_SRGB_GAMMA
-
-#ifdef BABL_USE_SRGB_GAMMA
+#include "config.h"
 
-static inline double
-linear_to_gamma_2_2 (double value)
-{
-  if (value > 0.0030402477F)
-    return 1.055F *pow (value, (1.0F / 2.4F)) - 0.055F;
-  return 12.92F * value;
-}
-
-static inline double
-gamma_2_2_to_linear (double value)
-{
-  if (value > 0.03928F)
-    return pow ((value + 0.055F) / 1.055F, 2.4F);
-  return value / 12.92F;
-}
+#include "babl.h"
 
+#include "base/util.h"
 
-#else
-  #define linear_to_gamma_2_2(value)    (pow ((value), (1.0F / 2.2F)))
-  #define gamma_2_2_to_linear(value)    (pow ((value), 2.2F))
-#endif
 
+#define INLINE    inline
 
 /* lookup tables used in conversion */
 

diff --git a/extensions/gggl-lies.c b/extensions/gggl-lies.c
index c3e726e257fa6b996c70b75b4a47b80813e3b7cd..87667dd1aa52c6e3fe414a84e99a28b7c75690c7 100644 (file)
--- a/extensions/gggl-lies.c
+++ b/extensions/gggl-lies.c
@@ -1,7 +1,8 @@
 /*
  * This file was part of gggl, it implements a variety of pixel conversion
  * functions that are usable with babl, the file needs more cleanup, and
- * doesn't return the number of samples processed as a long, like it's supposed to.
+ * doesn't return the number of samples processed as a long, like it's
+ * supposed to.
  *
  *    GGGL is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
@@ -22,13 +23,16 @@
  *  Copyright 2003, 2004, 2005 Øyvind Kolås <pippin@gimp.org>
  */
 
+#include "config.h"
+
+#include <math.h>
+#include <string.h>
+
 #include "babl.h"
 
+
 #define INLINE    inline
 
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
 
 /*
  * Implemented according to information read from:

diff --git a/extensions/gggl.c b/extensions/gggl.c
index 8cb5f2c1eeb7c9724c9ea3d66e20f046c128e7c2..f8fc25021d9f760c10eaffa88b6e82896de138ca 100644 (file)
--- a/extensions/gggl.c
+++ b/extensions/gggl.c
@@ -21,14 +21,16 @@
  *  Copyright 2003, 2004, 2005 Øyvind Kolås <pippin@gimp.org>
  */
 
-#include "babl.h"
-
-#define INLINE    inline
+#include "config.h"
 
 #include <math.h>
-#include <stdio.h>
 #include <string.h>
 
+#include "babl.h"
+
+
+#define INLINE    inline
+
 /*
  * Implemented according to information read from:
  *

diff --git a/extensions/naive-CMYK.c b/extensions/naive-CMYK.c
index 1fcc7de2bb24e4ee029bcbac590f4dd29d405e1b..783df349883579c549045d68d21ec9f07f455f75 100644 (file)
--- a/extensions/naive-CMYK.c
+++ b/extensions/naive-CMYK.c
@@ -16,21 +16,21 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#include <string.h>
+#include "config.h"
+
 #include <math.h>
-#include <assert.h>
+#include <string.h>
+
 #include "babl.h"
-#include "util.h"
 
-static long
-rgba_to_cmyk (char *src,
-              char *dst,
-              long  n);
 
-static long
-cmyk_to_rgba (char *src,
-              char *dst,
-              long  n);
+static long  rgba_to_cmyk (char *src,
+                           char *dst,
+                           long  n);
+
+static long  cmyk_to_rgba (char *src,
+                           char *dst,
+                           long  n);
 
 int init (void);